Convention API update + class structure minor update
Convention API update