Changed implementation of Money