#12 Revise adl annotation parser