Refactor Interface extends