[architecture] fix lists