Add some useful functionality