Add @key and @select