fixed for reset properties and added BuildConfig