Optional -> JmsOptional to make it compatible with Java 8
keep the order of mappings (didn't run on Java 8)