Removed bug and added new class and relationship