Refactored intializize
Updated model