Little bit of cleanup
Added authentications types