Updated the relationship parser to cope with attributes