Created a generic collection type to make add/remove more efficient