Add remaining major functions