Fixed methods privacy and add some type checks