Streamline decorator handling