Removed skip_if_null functionality and added indexes