remove database-dependency, added properties