Reworked Parceler integration