Changed package name and added more types to get_type method