Add some basic functionality