Add support for PICK