Updates to fit Skypicker needs