Functional extensions added