Refactored and added pg to dev env