Added more type support for serializer