Updated Alloy model
Updated java code