[API] Urgent tasks

Fix #216