Added to DB model, added DATA, removed Tests stuff