Added const support