Updated documentation and removed 5.3 incompatible short tags