Modified new and create