Scoped macro
adjust Collection interface