More work on API dependencies