Add layered option system