Finaliz better support