Support for setup/teardown
Improved metadata