Prepare for multi controllers support
Multi controllers supports
Changed coding style