Improvement/change ids to string