Modifications for dev environment