Add some useful features