Moved properties and Protocol declarations to .h files so can be subclassed