Requires tests for new method signatures like findbyRank etc.