Add format classes support