Added CommonFactory