Clean up Entity interface

Just a little housecleaning. Added missing interface declartions.