Initial support for storing decimal values + minor improvements