Add constructor annotations and change arrow colors