General updates

Features/Api changes: