Added authentication support