1278 | Subhas/Kavitha | Add API stuff and keep backwards compatibility