Better init support