Modify model. Let api more easy to use