Refactored layer features