Changes to BC Module to avoid Class Load issues.