Add some helper code