Changes in type definitions for slightly better performance