Reverted back to simple boolean object structure