added todo to remove javax.lang enums from model