.whenPost and whenGet added