Fixed issues and changed entry back from cloneable