All util methods are changed to use collections - List<>