Refactored LUI dependencies to work for attributes as well as elements.