Create common module #18