Additions + small updates