Some fixes and prepared for parsing xml returned