Version 2.4.5: added support for Locks