Cleanup requirements and added pagination to organisations