Adding more prototypes and fixing assigment of variables [ci skip]