Peformance improvements
More performance tweaks