Added some "basic" classes