Worked on more class bindings