Now with working database