Feature/simplified init method