refArea now optional
More metadata
Refactor