Added internal fields and methods to all classes