added Lock handling & auto event and list handling (by type)