Remove dependency on common models in ids