Modified structure for multi format support