Removed default lock support with extensions