Refactoring
Bug fixes for missing attributes.