Features updates to bring everything inline