change: Implement some feature (partially)