Proper asset handling