Updated Tags and Delegation models for #21