Fixes and new classes