Update to new arch
Support visual metrics