Cleaned up API and object model