Simplified typedefs
Improved initialization