Fix single item tuple
Update API with new models

API code is a lot simplier and easier to read ☺