Version 1.0.2 Alpha: Improved code structure