Main library optimizations #2