Added possibility to force format