Updated module to support full components