Fix version issue and added Market entity