Fixed formats and added prefix option