Added support to development environment