Updated to hopefully remove dep cycle