Added lookup button support