Support for new waterline semantics (0.4.x)