Filled some gaps in functionality