Replaced static array with collection