Development state - enhancing classes

Development stage and better perfomance of the functionalities