Work on AbstractionLayer