StatementHandler Changes + slight Domain Statement change