Added new basic classes