Add some more basic features