Changes made by Ivan Vlaevski (ivlaevski@objectsystems.com).