Added more in-depth components