Add more options functions