Some abstract changes