Remove duplicate code bits
Add simpler property dictionary parsing without blocks
Pod update?