Added tags and extra support