Better support for development