Adding Date back and Enum support fixed with Spring workaround