Added agnostic design elements