Fixed entity declared at the wrong place
Misc