Python3 support, better encapsulation, function to disable builtin targets