Refactored Layers