With apis & test cases