Updated API functionality