Initial changes to create classes