Few modifications to helpers