Made parsing stuff for add robust