Incorporated unannotated handling