Avoid circular dependencies