Changed Names from CFlag to SubOption etc..