Followed PMD hints:
	- ArrayList<> is now lazy-initialized List<>