Added type safety