Add final support for systematics