Avoid circular dependency error