Added more ID grabbing for the methods that needs them