Added support for a development server