add __PACKAGE__, not perfect yet though