Added refactored interfaces into the model