Fixed dependency cycle