Add some new basic classes