Updated basic controller handling