Added Active Record feature