Use better methods and move common to Utils module..