Stable version after merges
Employee Entity implementation