Changed format output
Added "format on demand" for Propel 2.0