Updated to new decoration API

Closes #1