Futher edits in Entry type prototypes