Improved creation logic and API.