Improve sp_01_Create + Refactor sp_02_Drop