Make the API more extendable