Added config class + updated references