Add some convenience functions from other project