changed namespace + added database prefix