Finished ER to DB.
Re-enabled shape count check.