Updated AQP with some ease of use fixes