Adding controller architecture to better manage objects