Removed some optionals on bean properties