Refactor - push up all interfaces