Add namespace csx
update register functions