GH21 - changed from ArrayList to List in setProperties