Move common methods to common module under concers
Update common methods