Better using direct calls to the Model instead of wrapping it in a pointless library function
Port the cardinality function to the place where it belongs (Model) and make it way lighter for the server
Merge branch 'master' into apiv1