added better namespace. added more parse code for builder