Added custom utils