Feature/enhancements

Same dictionary comprehension syntax as above could be used here.