Make API even more extendable