Added functionality for inheritance