use Internal class to access internal identifiers

let me know what you think of this. Not sure if that's too much.