Adding BUILD_NUMBER checking