FDA Call Controller refactor