Implemented supply, made identifiers conform