Updated according to new documentation