GA related changes plus some enhancements