Updated library. Included entity, property and functions