[UNSTABLE] Composed Datapoints (fixing some problems)