Made component inclusions more specific