Added remaining functions