Added more functional units