Revert "Revert "Implemented more methods""

This reverts commit cc695570361d6d207b618fde7704e3a5b9a1fdf0.