Some architecture enhancement