Added setter and getter generation