Version 1.0.5

Structural changes and optimizations