Now, definitely restarting implementation structure