Added tagging and updated requirements