Made class for database and prepared for next release