Resource properties are now dict

Change-Id: I73ebb7603ed5ed4028427314a8bbc4b5e1eee123