Adden some functionality