Use package wildcard in protocol
Add offline mode