Removed typedefs for consistency