Improvements to id loading