Fixed issues from moving the configs to the __init__'s of classes