Mode parsing added