GBE-440: api annotations