Closes gh-25 Refactored the asset key assignment