Adding new features like rank page and recursive definitions