Intermediate commit to better authentication support