further modification on entities