Add debug code for features