Fixed Interfaces class hierarchy