Refactored layer