Add string id support