Feature/utility expansion