Removed five for in loops.

Added default options and metrics to entities.
Updated tests.