Implement some stuff in OpHandler, reduce clutter