Improve resizing/lock handling
Handle identifiers