Added image sets and finished API