Revamp the database + update controllers