Updated to work with new development environment.