Make API better