Complete the rest of api