WIP: added methods for locking/unlocking node and property locker, small refactoring