Updated BPC load logic