Feature/placeholder fallback

Refers to #449