[TASK] Add some type checking