Fixed dependency cycle issue