More work done on Quest class