More base classes, added Assets