Implement some feature requests