Vairable support. Improved handlers and grammar management.