Updated signatures
Added additional checks for xcart since 5.0 changed the file structure.