Added entry factory
Added entry serializer