Make this work with YML configuration