Added lock map capability