Feature/before marshal