Extend some functionality