Added properties and holders from old storm