Added remaining functions.