Added more interaction with DB