Added basic controller support.