Few more changes. Interacting with DB does not work