1. Renamed abstract to is_abstract.  2. Made entity declaration explicit.