add - more markup insertion and prop extensions