Declare more stuff public