Added composite key, constant key and hash key + tests