Authentication feature for 2.2