U1 - U5 levels refactored
New base classes