Changes to accomodate more apis