Protocols extendened and bugs fixed