Updated with configuration handler.