Further handling backwards compatibility outside of templates