Updated collection model and abilities to be inline with team decision