Added controller support
Updated test build