Added Dictionary lib + error checks