Adding ag support