[Improved] Use new constructor