Decorate import & include entries as objects