added support for base states and avoided user-defined multiple item definition (possible violation of ODL)