Added decoder and basic functional units