Changed ExpectantMap to StrictMap, added conditions that values cannot
be null and keys cannot be added more than once