Commit 5 - Updated API, simple database operations