Added functionality for many to many fields