Minor improvements
Build out class to new API specs