Removed null checks
Removed unused default tag property