Changed scope of id to private
Updated enity using common library