[1016578] Addressed feedback - used createType, and used arrow functions