Arrangement functions
Implement ref()
Refactor collection functions