Added things to top-level init