Added basis functionality