Factory - headers updates

Headers updated