Remove circular class dependency