Updates to supported the intended behavior

@joshdholtz