small changes for performance, removed CVS tag and switched to consumes interface