updated to use configuration objects