Added utils to avoid NullPointerException