Changed it so that it actually uses the declarative models :P