Added traps and permissions