Adding missing l2hash stuff. Untested