Additional features should be alternatives. Closes #38