Adding remaining functions