Match and resource methods on mapper. Added controller factory.