Some added functionality