Updated functionalities with new db