improved BuildConfig