Added basic typing