Updated to handle get collections