Fixing components integration