Moved dictionary to own package. Dictionary using defer for unlocks.