updated schema and fixed some namespace issues