Add support for padding