[TASK] Fix typing errors and method signatures