Prototypes codes improvements