#000| Fixing build, reverting the classes to previous version