Compatibility with IP based access; Better docs