Add tags and images support