added user props
added entities