Make format compatible with database