Used java nullable types + moved enums.