Database refactor
Google maps refactor to use namespace