Removed header dependency