[FEATURE] Added entity for units