Updated API to add its basic structure