Fixed and Updated APIs