Back to solid state
Add erb support