Fix `require` call
Support additional annotations