Completed static db refactor