Add increased functionality