Avoid circular dependency