Move __call__ to super class