Database logic added
Name of class changed