removed unnecessary dependencies
included some database functionallity