Changes

Add new classes and change old classes