Updated to use Config