Fix arguments and Add type check functions