Refactor Market Object