Improvements on primitive (moved to element etc).