Adding in current config classes