singleton renaming
added database module