Added if checker and substitution of tags
Integrated domain model in WiBAF