Adding StatuteInternal class. Updating tests and references