API Updated. Closes #441