Improve custom annotation scanning