Add some more useful stuff