Finish and improve the smart creation