Added full functionality with reduced dictionary