Enhance active record