Refactoring of 3.5inches support