Moving away from dynamic scope. Removing use of bean.