fixed some dependencies and better api support