Add some convenience functions and more specs