Improve erb support