Several changes to run this project on local env