Improvement office (Grand Theft Auto 5)

Is it possible to improve the office after the purchase? To farm money now too lazy, but gradually as the game progresses I would like to get the office fully loaded, so the question arose immediately whether to buy it without the bells and whistles or is it better to wait?