Simplified event add and more