Fix bugs and create new classes for future