Added various utils and extensions