Added and changed some collection extensions