Fixed class functions not having self arg