Fixing load performance issues

Fix load performance issues and increase performance by a factor 1k.