Added Currency and db support