Added in better controller support