API and fixes, DB model update