Add support to External Ids