Added classes for static extension