SW-24 Added new types of padding