Modified utils to support non-dictionary inputs