20140928 - Changed the class structure to be ACE-BDF