Integration of Brian's changes into /develop
- Removed the dependency on metadata