Revamp of API