Updated galaxy manager