Added support for empty and expression tags.
Made changes to reflect changes to tags.
Changes type of tags to IValue.