Changed namespace
Added and updated methods.

Changed namespace as well, obviously.