LPS-40865 Read the previously stored value from the type settings
LPS-40865 Move things closer to where they are used unless they are used in more than one place