Completed the entity implementation for FMA

Signed-off-by: Martin Evans <martindevans@gmail.com>