Implemented new Database feature