Updated to exclude some components