restrict value to number sub-type
remove generics from entity, restrice values to number, add unit test