SW-19 Added rest of methods