Updated API to be similar to the API format from Meech @ Nirvana