Improved the way Statements are prepared to contain more information.