Push & User improvements