Some changes for version 5. May have broken lookup?

Signed-off-by: Jason Kuster <unexpectedapocalypse@gmail.com>