Added newer functionality