Polish, added type to analysis json