Address Andrzej's concerns and enhancements