Feature/improving init user