compat: better lamp support
compat: better lamp & graph support