Issue #38 Fixed entity definition