Fixes #68 - not CPM w/ composable macro support