Working on the architecure