added tags and basic security