added tag handlers + sub-proj