Version 2.0.5 Alpha

Refactoring