cleanup code (2)
ADD async for dictionary
ADD classes to dictionary template