New Entity binding in asset parser and some refactoring.