Changed from decorator to replacement. Added z-sails-mock.