Removed basic classes for clarity