icecat access refactored