Switch to new plan features model
Merge violasong changes