Removed POJS and enabled explicit locking