Refactor business objects
refactor business objects 2