Added internal protection, events, general tools