Switch to using AstroLib