Refactor Colocation Related classes