Adjusted some controllers for metadata generation