Some more code for DB