Patrickod/fix revokable model reference