Changes for local environment