Updated ChangeLog
Updated Behat feature files and tests
Fixed implementation
Use the metadata model
Updated docs