Adding possibility of custom PREFIX