Changed Short tags to long tags and added ldap auth