Added property checking code in library file