Replaced alloc/init with new