Updates to allow simple API access