Backwards compatibility with old layout