Modified the interface of some classes and methods, for consistency across the whole framework