lots of work converting to standard bean setters