Updated model. Added functionality for tags (requires Mutgaen)