Moved to classical model for separated functionality